From d47e82ffddc4df01e76d3829f25bbc29dc48672b Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 30 Nov 2011 19:05:34 -0500 Subject: [PATCH] entry: simplify code We can unconditionally call into the icon helper methods now that we removed the g_return_val_if_fail() checks. --- gtk/gtkentry.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index f0b6cb75bf..989b24aff3 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -8019,8 +8019,7 @@ gtk_entry_get_icon_gicon (GtkEntry *entry, if (!icon_info) return NULL; - return _gtk_icon_helper_get_storage_type (icon_info->icon_helper) == GTK_IMAGE_GICON ? - _gtk_icon_helper_peek_gicon (icon_info->icon_helper) : NULL; + return _gtk_icon_helper_peek_gicon (icon_info->icon_helper); } /** @@ -8053,9 +8052,7 @@ gtk_entry_get_icon_stock (GtkEntry *entry, if (!icon_info) return NULL; - return _gtk_icon_helper_get_storage_type (icon_info->icon_helper) == GTK_IMAGE_STOCK ? - _gtk_icon_helper_get_stock_id (icon_info->icon_helper) : NULL; - + return _gtk_icon_helper_get_stock_id (icon_info->icon_helper); } /** @@ -8088,9 +8085,7 @@ gtk_entry_get_icon_name (GtkEntry *entry, if (!icon_info) return NULL; - return _gtk_icon_helper_get_storage_type (icon_info->icon_helper) == GTK_IMAGE_ICON_NAME ? - _gtk_icon_helper_get_icon_name (icon_info->icon_helper) : NULL; - + return _gtk_icon_helper_get_icon_name (icon_info->icon_helper); } /** -- 2.30.2